Autogenerated HTML docs for v2.6.0-rc2-23-g0e57
diff --git a/git-config.html b/git-config.html index 7852ebd..f4cf851 100644 --- a/git-config.html +++ b/git-config.html
@@ -2588,12 +2588,9 @@ "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner. </p> -<div class="literalblock"> -<div class="content"> -<pre><code>When preserve, also pass `--preserve-merges` along to 'git rebase' +<div class="paragraph"><p>When preserve, also pass <code>--preserve-merges</code> along to <em>git rebase</em> so that locally committed merge commits will not be flattened -by running 'git pull'.</code></pre> -</div></div> +by running <em>git pull</em>.</p></div> <div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> for details).</p></div> @@ -5675,12 +5672,9 @@ pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis. </p> -<div class="literalblock"> -<div class="content"> -<pre><code>When preserve, also pass `--preserve-merges` along to 'git rebase' +<div class="paragraph"><p>When preserve, also pass <code>--preserve-merges</code> along to <em>git rebase</em> so that locally committed merge commits will not be flattened -by running 'git pull'.</code></pre> -</div></div> +by running <em>git pull</em>.</p></div> <div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> for details).</p></div>
